From: Jan Djärv Date: Thu, 15 Aug 2013 17:36:45 +0000 (+0200) Subject: * nsmenu.m (menuWillOpen:): Fix preprocessor test. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3275^2~223 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=63216c5ee19df8da21574fd5fbafeea8321433a9;p=emacs.git * nsmenu.m (menuWillOpen:): Fix preprocessor test. Fixes: debbugs:15001 --- diff --git a/src/ChangeLog b/src/ChangeLog index 028c33848a4..6ee3ec6f089 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-08-15 Jan Djärv + + * nsmenu.m (menuWillOpen:): Fix preprocessor test (Bug#15001). + 2013-08-15 Lars Magne Ingebrigtsen * image.c (imagemagick_compute_animated_image): Respect the GIF diff --git a/src/nsmenu.m b/src/nsmenu.m index 3266d76450c..5af813ac758 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -575,7 +575,7 @@ extern NSString *NSMenuDidBeginTrackingNotification; { ++trackingMenu; -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 // On 10.6 we get repeated calls, only the one for NSSystemDefined is "real". if ([[NSApp currentEvent] type] != NSSystemDefined) return; #endif